From bb3ddb39f6a6cd272ebc61c778c19427196351bb Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 31 Jan 2002 15:26:52 +0000 Subject: [PATCH] Handle the case where bin->child is NULL. (#70153, Padraig O'Briain) Thu Jan 31 10:21:05 2002 Owen Taylor * gtk/gtkplug.c (gtk_plug_focus): Handle the case where bin->child is NULL. (#70153, Padraig O'Briain) * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): Actually call gettext() on the labels; previously they were marked with N_() but we never called gettext(). --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkplug.c | 2 +- gtk/gtktextutil.c | 2 +- 9 files changed, 65 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92252cad13..99d0dbcb15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Jan 31 10:21:05 2002 Owen Taylor + + * gtk/gtkplug.c (gtk_plug_focus): Handle the case where + bin->child is NULL. (#70153, Padraig O'Briain) + + * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): + Actually call gettext() on the labels; previously they + were marked with N_() but we never called gettext(). + Wed Jan 30 20:15:49 2002 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 92252cad13..99d0dbcb15 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Thu Jan 31 10:21:05 2002 Owen Taylor + + * gtk/gtkplug.c (gtk_plug_focus): Handle the case where + bin->child is NULL. (#70153, Padraig O'Briain) + + * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): + Actually call gettext() on the labels; previously they + were marked with N_() but we never called gettext(). + Wed Jan 30 20:15:49 2002 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 92252cad13..99d0dbcb15 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Thu Jan 31 10:21:05 2002 Owen Taylor + + * gtk/gtkplug.c (gtk_plug_focus): Handle the case where + bin->child is NULL. (#70153, Padraig O'Briain) + + * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): + Actually call gettext() on the labels; previously they + were marked with N_() but we never called gettext(). + Wed Jan 30 20:15:49 2002 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 92252cad13..99d0dbcb15 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Thu Jan 31 10:21:05 2002 Owen Taylor + + * gtk/gtkplug.c (gtk_plug_focus): Handle the case where + bin->child is NULL. (#70153, Padraig O'Briain) + + * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): + Actually call gettext() on the labels; previously they + were marked with N_() but we never called gettext(). + Wed Jan 30 20:15:49 2002 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 92252cad13..99d0dbcb15 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Thu Jan 31 10:21:05 2002 Owen Taylor + + * gtk/gtkplug.c (gtk_plug_focus): Handle the case where + bin->child is NULL. (#70153, Padraig O'Briain) + + * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): + Actually call gettext() on the labels; previously they + were marked with N_() but we never called gettext(). + Wed Jan 30 20:15:49 2002 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 92252cad13..99d0dbcb15 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Thu Jan 31 10:21:05 2002 Owen Taylor + + * gtk/gtkplug.c (gtk_plug_focus): Handle the case where + bin->child is NULL. (#70153, Padraig O'Briain) + + * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): + Actually call gettext() on the labels; previously they + were marked with N_() but we never called gettext(). + Wed Jan 30 20:15:49 2002 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 92252cad13..99d0dbcb15 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Thu Jan 31 10:21:05 2002 Owen Taylor + + * gtk/gtkplug.c (gtk_plug_focus): Handle the case where + bin->child is NULL. (#70153, Padraig O'Briain) + + * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): + Actually call gettext() on the labels; previously they + were marked with N_() but we never called gettext(). + Wed Jan 30 20:15:49 2002 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index aff46e861b..eb4f10c228 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -841,7 +841,7 @@ gtk_plug_focus (GtkWidget *widget, { /* Try to focus the first widget in the window */ - if (gtk_widget_child_focus (bin->child, direction)) + if (bin->child && gtk_widget_child_focus (bin->child, direction)) return TRUE; } diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c index 7a53fab676..f6265e6703 100644 --- a/gtk/gtktextutil.c +++ b/gtk/gtktextutil.c @@ -102,7 +102,7 @@ _gtk_text_util_append_special_char_menuitems (GtkMenuShell *menushe info->func = func; info->data = data; - menuitem = gtk_menu_item_new_with_mnemonic (bidi_menu_entries[i].label); + menuitem = gtk_menu_item_new_with_mnemonic (_(bidi_menu_entries[i].label)); g_object_set_data (G_OBJECT (menuitem), "gtk-unicode-menu-entry", &bidi_menu_entries[i]); -- 2.30.2